add HTMLImageElement for Material uniform #5857
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hey @polluxll, thanks for the PR! Can you submit a Contributor License Agreement (CLA) so we can get this reviewed and merged? |
|
@ggetz ,I have submited the CLA file by mail.
|
|
@polluxll I emailed you a question about the CLA, but haven't heard back. Please let me know if you didn't receive the email. Thanks! |
|
We now have a CLA from @polluxll. Thanks again! |
ggetz
requested changes
Oct 9, 2017
| }else if(uniformValue instanceof HTMLImageElement){ | ||
| material._loadedImages.push({ | ||
| id : uniformId, | ||
| image : uniformValue |
There was a problem hiding this comment.
Since this block is a duplicate of the HTMLCanvasElement case, can we just add and additional or for HTMLImageElement?
There was a problem hiding this comment.
@polluxll Please address this comment when you have a minute. Thanks!
Source/Scene/Material.js
Outdated
| @@ -941,7 +946,7 @@ define([ | |||
| uniformType = 'float'; | |||
| } else if (type === 'boolean') { | |||
| uniformType = 'bool'; | |||
| } else if (type === 'string' || uniformValue instanceof HTMLCanvasElement) { | |||
| } else if (type === 'string' || uniformValue instanceof HTMLCanvasElement||uniformValue instanceof HTMLImageElement) { | |||
There was a problem hiding this comment.
Adjust formatting here to be consistent with spacing.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In order to make an animation by many images,we must know every image status in the process,so I change the timeline to the next time after the current image loaded.
material.uniforms.image = loadedImage;